git merge strategies

join shbcf.ru